Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 19 Jan 2010 22:56:21 +0000 (22:56 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 19 Jan 2010 22:56:21 +0000 (22:56 +0000)

Trivial merge